Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 31 Aug 2010 22:44:36 +0000 (22:44 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 31 Aug 2010 22:44:36 +0000 (22:44 +0000)
commitf12857822a8b58e3e501bf407df108e30ac0f786
tree82a7eca0caba22a6e95bef51eadf871996a4eb28
parente70c068dfd8b78a05e2a645a1ce1d187eef73511
parentdc6ef48847cd06c69fa690a97cf8a2b3a88f67a7
Merge from mainline.